Skip to content
This repository was archived by the owner on Jul 8, 2025. It is now read-only.

Conversation

@Oludare96
Copy link

Purpose

Changes

Side effects

Ticket

Oludare96 and others added 30 commits June 1, 2017 11:18
…nto developOOO

* 'developesc' of https://github.com/cardene/ember-share:
  render id and status
  rendering id and status
  Rendering id and status
  Template edits
…nto developOOO

* 'developesc' of https://github.com/cardene/ember-share:
  model of history page format-- incorrect data
  data rendering on new url
  new url harvest-history but no data rendering yet

# Conflicts:
#	app/templates/harvest-history.hbs
…nto developOOO

* 'developesc' of https://github.com/cardene/ember-share:

# Conflicts:
#	app/templates/harvest-history.hbs
cardene and others added 28 commits July 12, 2017 09:30
…to developOOO

* 'develop' of https://github.com/Oludare96/ember-share:
  [SHARE-809][Feature]Consistent wording for search bar (#194)
  [SHARE-938][Improvement] Only display sources with data on sources page (#193)

# Conflicts:
#	app/routes/sources.js
…into developOOO

* 'developOOO' of https://github.com/Oludare96/ember-share:
  commit
  commit
  [SHARE-809][Feature]Consistent wording for search bar (#194)
  [SHARE-938][Improvement] Only display sources with data on sources page (#193)
…nto developOOO

* 'developesc' of https://github.com/cardene/ember-share:
  statuses 2 and 3 emojis on status board

# Conflicts:
#	app/adapters/harvest-log.js
#	app/components/source-health.js
…into developOOO

# Conflicts:
#	app/templates/status-board.hbs
…into developOOO

# Conflicts:
#	app/controllers/status-board.js
@laurenbarker
Copy link
Contributor

Closing in favor of #198

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants